From 47d1a51480ad0f602d747e460d619436c907deea Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 12 Jul 2013 12:54:42 +0100 Subject: [PATCH] xen: arm: make zImage the default target which we install The zImage compatible binary is the useful one on real hardware. The relocated ELF thing is only really useful when booting directly on Fast Models. The customary suffix for that case is .axf so provide that as a target. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 87fabe182f..5ae5831982 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -40,20 +40,15 @@ endif ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS) -$(TARGET): $(TARGET)-syms $(TARGET).bin +$(TARGET): $(TARGET)-syms $(TARGET).axf + $(OBJCOPY) -O binary -S $< $@ + +$(TARGET).axf: $(TARGET)-syms # XXX: VE model loads by VMA so instead of # making a proper ELF we link with LMA == VMA and adjust crudely $(OBJCOPY) --change-addresses +0x80000000 $< $@ $(STRIP) $@ -# -$(TARGET).bin: $(TARGET)-syms - $(OBJCOPY) -O binary -S $< $@ - -#$(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32 -# ./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \ -# `$(NM) -nr $(TARGET)-syms | head -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'` - ifeq ($(lto),y) # Gather all LTO objects together prelink_lto.o: $(ALL_OBJS) @@ -97,3 +92,4 @@ dtb.o: $(CONFIG_DTB_FILE) clean:: rm -f asm-offsets.s xen.lds rm -f $(BASEDIR)/.xen-syms.[0-9]* + rm -f $(TARGET).axf -- 2.30.2